Miscellaneous fixups