Made changes to returned system messages