More stupid changes to rebuild on GH