Code review fixes
- #1975