Fixes to the status lines