Minor fixes for supporting Ubuntu 14.04