Some bugfixes for alpha10