Minor tweaks for non-mac setup