Bugfixes for new decoupling functionality MAR