More animation fixes