Fixing staging bugs in develop branch