fix small bugs
fix small bugs