Small fixups1