Fixes per code review