Merge pull request #1596 from rubenk/fix-a-few-more-prototypes