diff --git a/parameters.cake b/parameters.cake
index 191620aa70..eceba07e69 100644
--- a/parameters.cake
+++ b/parameters.cake
@@ -26,7 +26,7 @@ public class Parameters
             VersionSuffix = build != null ? $"-build{build}" : "";
         }
 
-        Version += "-build" + context.EnvironmentVariable("BUILD_BUILDNUMBER").Replace(".","");
+        Version += "-build" + int.Parse(context.EnvironmentVariable("BUILD_BUILDNUMBER").Replace(".","").SubString(4)).ToString("D5");
 
         NuGetPushBranch = "master";
         NuGetPushRepoName = "https://github.com/AvaloniaUI/Avalonia.Native";
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 593c8bf85e..a4d7bdd8c8 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -23,7 +23,7 @@
 
     <ItemGroup>
       <Content Include="../../Build/Products/Release/libAvalonia.Native.OSX.dylib">
-        <PackagePath>runtimes/osx/native/libAvalonia.Native.OSX.dylib</PackagePath>
+        <PackagePath>runtimes/osx-x64/native/libAvalonia.Native.OSX.dylib</PackagePath>
         <Pack>true</Pack>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>