Minor changes to setup