fix minor bugs
fix minor bugs