Several fixes for animations