Minor corrections (can't remember what)
Merge commit 'd75d99bc4a5881a97ba80b75b806cafd30ab082e'