Fix race condition in make
Clean up some more