Fix custom skeletons. Closes gh-556.