More staging bugs fixed in develop branch