Fix the path to spec helpers in the manifest
Fix some type mismatches for Oid return values.

Thanks to Mina Naguib for the fix.