Fixing more crashing bugs
Merge branch 'master' into production