Fix some bugs from GLPI < 0.84.6