Anyway, the second commit is not the actual problem, the first one is the one which actually solves the problem I had with the compilation.