Other patches Van OS

Up