Fix compilation on ubuntu, hopefully without breaking other stuff