General fixups