Change types to match headers

I'm not certain if this is correct, but I think it matches the signatures from the header files.