2: Fixed warnings