Fixes for online status