Fixing language issues and labels