more non-Mac build fixes