A few improvements on init/setup scripts