Fix number of small issues