Fix up some types