Merge 2 fixes