Multiple animation fixes