Fixing staging bugs in development