Fix CGF somewhat.