Fixed some dependencies issue to make the code compile