Management fixes and more