Fixes related to code review comments