Various fixes

This might fix the issue with g++, but I'm not sure.

Also, what's with README.md? And what license is this under?