a couple of cr fixes is added