Fix build
Install tweaks