Fixes

and more build fixes