fix minor bugs for cst