Merge "Fix minor issues in dmux default impl"