Some additional changes to the match building process