Fix issues with NativeBinary references