Fixing some issues

Here are some quick fixes in order to compile this interesting project properly.