fix some of the types