Unix and phantomjs fixes