more build fixes..