Fixed small "issues"