A couple more fixes to make the frame counts for the animations come out exactly right