Fix the small issues