Small changes to setup