Fixes due to remarks in code review