Fixed small code issues!