Updating things to reflect issues with PhantomJS