Fixing array/scalar types