Various changes to the default setup