Minor changes to animation handling.