Skeleton fixup