fix build
fix arrays