tools.pp: Port over a couple more from provision.sh