small tweaks for new skeleton