Fixed some issues found in code review