Fixing database build matrices