Several fixes for compatibility with Xubuntu 14.04