Mk interface

This adds the MK interface fixes from Marco Bauer