Update to recommended build settings, fix analysis issue