Skeleton fixes