some fixes from bete tester