Cleaning up some git bugs