Fixes for staging