Fix bloated build matrix