fixes for 2.7.0 & remove arrays