Fixed fake staging bugs in develop branch