Some merge leftovers from patch cleaned up