Fixing issues with setup script