Small CI and build tweaks

Just a couple small build tweaks to do some debugging. No need to review, @elehack will merge.