fixup miscellaneous things