Fixup after feedback