Some stuff for production mode