Small changes to logging