More Enraged Koala fixes.