A number of fixes, particularly around indexing of commits