Fix warnings, accept latest snap-extras