Fix some types