Fix build path
Fix build path
General fixes