[build] more build fixes