Hackathon fixes

Example: https://travis-ci.org/prezi/spaghetti/jobs/40512391

It was failing for me too, without any changes since last Friday so I think something changed on the oracle side.