More animation tweaks