Atlas fixes in production