bug fixes for new 3.0rc1