Move ap_race_id to end of table, fix inserts