Various non-breaking changes