Various fixes and extra squelettons