Fixes for new stage