further build fixes