small skeleton fixes