Fix little issues
Fix more small issues