Some diff cleanup