Add Tony's fixes