More GovCloud bug fixes