Fixup some stuff