Fixes to get it to build ....