A few more adjustments to the status behavior