Some minor changes to logging stuff