Fixed problems with setup script