More changes after initial test deployment