Fixes for BZ8260