fixes for staging deployment