fix staging bugs in develop branch