[Priti] Minor fixes