[WIP] Fix problem with compilation.