futher build fixes