Thor 0.18

Minor compatibility updates for breaking changes and a version bump