Many small changes to make things consistent for AMP Camp 4.