Correct P/Invoke mistakes v2