Fixed small bugs 2