Multiple fixes.

Multiple fixes.