Some small fixes after first successful test suite run for starter league.