more tweaks to account for linux