Minor fixes to make it go on production