Fixes for Ubuntu 14.04