Tweaks towards getting binstar build working