Fix system test failures