Fixed staging bugs indevelop branch