Fixes for supervisor and container