build matrix fixes