Further fixes to build path and build output