Microfixes round 2 for PR 23