Change types to match headers
Merge pull request #1 from CrimsonVoid/fn-sigs

Change types to match headers