Fixed small issues after testing