Merge pull request #265 from boudewijn-tribler/bugfixes

Fixes