Fix build matrix