Fix additional short arrays.