Fix handling of compound arrays