-Fixed warnings