some cfd fixes