Fix code review comments from @jcrobak