Fix support for array types