Update some aj files before merge in from master.