[WIP] Fix classic build