Added Arthur's fixes