Minor fixes to allow development under Ubuntu