Fixes for status emails