Fix staging bugs in develop branch