Fixed staging bugs in develop