Fixed stagings bugs in dev branch