Fixed the status messages