small cr fixes