Update deployment to 6.0 and fix project for this target