Changes to logging and settings