Fixes for code review