Fixed some build path issues