Trying to fix build matrix