Minor improvements to package/supervisor scripts.