minor messages bugs fix