some small fixups