Fixes of code review and typos