Fixes for compliance with karma => 0.11