Small fixes and logging message to the operator