Few more animation fixes