Some fixes...

Everything is in the commits messages. :)