Updated deps, ported changes from 1.3.2