Fix some atmos issues