Fix compilation. Hopefully I broke nothing