Little fixups