Fix some of the small issues