Tidied up a bit more after the config changes