Beta 8: general hotfixes...