Fixes according to code review comments