Fix alignment issues in FD passing code