Fixes for hosed git commit...