Improve vso assign and fixes