Tweaks to wcmake