Solved compile issues