fixes for kraken and lower versions

Change-Id: I0543b8ab2169e561ac8189331f38c8c5baa5a696
7 files changed