A few changes to get skel working on Nautilus