Fix commit

To prepare for breaking changes.