More bindist fixes