Clue code fixes