Fix some typos
Run extract messages
Merge branch 'fixes-2.0'