Animation fixes

Closes #4463
Closes #3784
Closes #4397
Closes #4231