Some small tweaks to build infra