More animation fixes.