Skeleton minor changes