Solved some compilation errors, still to solve...