More build fixes from Carlos Medina.