More skeleton fixes