Work toward ubuntu 13.10 compatibility