Fixes for code review - Contd.