Fixed Few compilation error due to merge