Slight modifications to messages