Fix builds.
Add more skills.