Fix problems due APT and structural changes.