Cosmetic fixes + thanks Peter for commit 101271515541d8008f6ec5a971eb44001027a9bd