A couple more build fixes.