cf-update fixes