Fixes for CFv2