Minor fixes.

Signed off by Henry J Wylde & Sivan Fesherman