Fixed staging bugs in develop branch (not really)