Fix compilation warnings after my last merge :(
EUCA-7575