Compatibility fixes for Ubuntu 14.04