Small fixes.

Small fixes.