Fixed bugs at staging stage