Fixed staging bugs in develop branc