WtfPlugin bugfixes

Fixed #153 and #155.