Fixed build/build path issues