tweaks to make things work better on other systems