Fix bugs on staging.