Phil's fixes