Merge pull request #480 from joakim-arm/glxml-fixes

Glxml fixes