Fixed warnings. Updated headers