a couple more build fixes