1369 - Address issues mentioned during external code-review