Changes necessary to get a fresh github checkout working