Minor fixes to status and client-side