Remove some question marks which confuse things