Fixup deps, implement poly cover