Work on making it work in 13.10