Minor fixes in skeletons