#127 more tweaks to setup_linux