Quick fixups