Fix Gendarme issues

Change-Id: Ie0ca165aa2846ab716558787ce2db228548fb76d