small fixups