Some changes

Haven't documented because they are trivial and don't change
functionality