Fixes from code review