Arthur's fixes