Minor changes to compile monica under Ubuntu
Merge with changes from master on github