Message fixes and default values changed