Minor changes prior to test deployment