Fix build³
Improve compatibility with Mesa