Vishal #0 platform related fixes