self CR fixes