Small changes to compile and test under LinuxMint