Fix some jasmine related issues