Fixes wrt cmars' review