Fixed staging buugs in dev branch