Emily's fixes