Little changes to setup