Fix more breaking animations

This is probably the last of them.