Minor changes for future git support