Fixing problems seen on staging