Some bugfixes after alpha-testing