Fixing some types