Fixed Staging bugs in develop branch