Fixup more things