Fixed building
Preliminary hash of fixing HES false positives

https://github.com/kjlubick/fb-contrib/issues/15
Polished up false positive fix