FIxed staging bugs in develop branch