Fixed small bugs
Fixed bugs