Changes for Ubuntu 13.10