Fix spec on 1.9 & little improvements