Fix remaining instances of Klutz being ineffective