Solve all compilation issues