Update build path
Bug Fixes