A number of small fixes to get both Debian and CentOS builds running