Changes and fixes to SkeletonKey