Improvements.

Signed-off-by: Krum Bakalsky <krum.bakalsky@sap.com>