Fixes on status command