Fixed some bugs with status