Fixed some issues with the skeleton