Merge in Simon's fixes