Fixes for staging stuff