Fixes for the Setup org steps