Attempt to fix some broken packages