Some updates for Ubuntu 14.04 and Fedora 20