Bring in Naha fixes

Also commit the attempted fixes at extraction which I forgot to commit
earlier.