Some fixes for apt-init.sh