Minor fixes to address review comments