- more build fixes