Fixup small bugs