bootstrapped with some raw-array fixes