Small fixes to the skeleton.