Try Fixing some Scrutinizer fails

Signed-off-by: Benoît Burnichon <bburnichon@gmail.com>