Fix compat with Trollius.

Also minor fixes has been done.