Some fixes after code review

No match.