src - Add support for heartbleed
src - Some build fixes