Fixed number of small issues