Fixed staging bugs in develp branch