Tweaks to get things building on my system