Also fix a few other occurences of 10.5 -> 10.6. This commit complements commit 4501c7e875 that seem to have missed these changes.
4501c7e875