Soak/FC/ToT fix; Camouflage fix
Simpler type check
Merge pull request #1089 from Fuzzysqurl/silcoon

Soak/FC/ToT fix; Camouflage fix