TypeGuess fixes