Fix errors with upgrade to ubuntu 13.10