merge 144 fixes.