Container fixes for record loading and materialization