Fixed staging bugs in developer branch.