Code review fixes'