Fixed staging bugs in develop branches