Fix some problems with multiplets