Fixup code after review