Minor changes in Supervisor