Fixed minor merge snafus.