more fixes for 8.0rc1