fix minor issues
fix minor issues