Fixes for the setup script