Fix typos

Also consolidate 'backward compatibility'