small changes to fix a mysterious build issue which is now fixed.