Fixed warnings, ready to patch.