Converted remaining c-arrays