Bugfixes

I blame Zyphirex.