Fixed bugs found in staging