Fixes for team model DB