Init file changes
Upstart changes
Minor tweaks for ADS use