Code changes to compile Omni on Ubuntu 14.04