some basic fixups