Fixed Governors that did not build, cleanup