build fixes... some more work