initial skeleton fixes