GA fixups and includes re-order