Fixed some project dependecy issues