Compute only diagonal parts for overlap
Fix bug with inner products computing only diagonal parts