Some bugfixes for alpha8