Misc changes on production