Git and other fixes