Added fixes from noeska.

Added fixes from noeska.