Minor changes to logging