More fixes for skeleton