Misc fixing to GL plugins
Better safe