Fixed small issues