Fix + nits.