Some more fixes for status