Resolved main warnings.