Fix conversions and use motor mixins