more changes to get cap deploy:setup working