Build fix and adjust array size