Fixed staging bugs in Develop branch