Small fixups