Fix up some things for the new 13.2