Fixed up fixed size array support