Fix protean + yawn
Merge pull request #1273 from Fuzzysqurl/bugs

Fix protean + yawn