Apt and version fixes