Solved compilation issues