Small improvements to head management system