Tweaks to accomodate linux servers