Log messages, error messages fixed