Fixes for TeamIT