Fixed Staging bugs in Dev Branch