Fix bugs at staging