Fixed some buildpath issues