Update to be compatible with Ubuntu 12 and newer