Fix some crashes and skinning