another round of fixes due to GLI