Code review fixes
Fix #90