Fixes on staging server