Few more fixes for the 0.8 patch.