Fixed warnings, cleared