Merge branch 'skel-fixes'