[Sandeep] Fixed build errors, still WIP