Fixed build.

I previously changed some function types to void, but at the time my
toolchain was not working (thanks arch) so I did not test the build and
did not realise that I broke it. Oops. It's fixed now though.