Merge branch 'sockmap-fixes'