fixes for static errors

Change-Id: I259110924289d4b37dc97f44776922dfabf671b5
Signed-off-by: Sounak Basu <sounak.basu@sap.com>
7 files changed