Fixed bugs on staging server