Trunk build fixes