fix some types