Fixes for code review comments