possible fixups