Updated some signatures so as to compile on Linux