Fix minor issues found during review