Some git cleanup
Fix references.  Fix warnings