Improvements

(i'm not sure it's logged upstream)