Fix more issues raised during code review