Fix compilation (WIP)