a couple of CR fixes is implemented