Jasmine & phantom fixes

https://trello.com/c/3s4snw1j