Compile on master

These changes enable the project to compile on master.

However I seem to get some runtime failure when trying to run the (succesfully compiled) executable. I don't think that's my fault (and I can't tell: rustfind does not compile on my machine without my changes), but until I'm sure, best not to merge this :)