Fixed all kind of small issues