A couple of build improvements (try 2)