Merge "Minor small fixes to old Animation code and docs."