cms bug fixes