Fix up function declarations to fix compile errors on clang