fixed some types