Fixes for latest karma.