A few bug fixes for status feature