Fixed Staging bugs in the develop branch