fixes for staging