Some more changes to allow config per environment.