Some bug corrections (/team)