Fix broken packages (2)