Some skeleton fixes.