Minor changes made to setup