Further fixes to compile in hudson
Merge pull request #103 from objectiser/minor2

Further fixes to compile in hudson