Merged improvements to the skeletons.