Fixes for CF v147