More reek fixups