fixes so that it compiles nicely under clang as well
Merge branch 'master' of github.com:psy0rz/Synapse