Updates and fixes for supervisor