INFRA-584 - Misc updates (still in progress)