TEMPORARY: Misc changes for test deployment