More Jasmine 2 fixes