Fixed staging bugs in develop branchdd.