Fixes for CFP