more workarounds for broken packages..