Fix more supervisord problems