Fixing failing compilation (WIP)