Port short-types patch