Hotfix and cleanup for system mixers