Fixed build errors, Attached interdiff for same. please review