Improve skeletons.