Fix mistakes pointed out by reviewer
Fix errors found by me