Fixing up compile errors for Travis-CI builds