Fix further issues per code review