Fix various issues
Switch to production