Fix issues that prevented me from building/uploading artifacts from my local workstation.