Fixed some calling conventions.

7 files changed