Fix some oversights.