Resolved some problems with placeholders for records in flight