Additional clue code fixes