fix: address bugs found when testing gen-build-spec#1265

AbhinavPradeep wants to merge 1 commit intomainoracle/macaron:mainfrom

abhinav/fix-gen-build-spec-bugsoracle/macaron:abhinav/fix-gen-build-spec-bugsCopy head branch name to clipboard