Fixes due to code review