Critical fixes to the alpha5 branch.