A few changes to setup