[WIP] Fix compile errors