Fixed crash from missed joins, fixed field renaming.