Merge branch 'xsk: another round of fixes'