[wallace] more fixes to failing csf scenarios