Various updates to get things to work for the functional testing.