Fix some bug for CMS