Fix build path

and misc small tweaks