Add a few tweaks to the skeleton