Avoid notice warnings caused by changes in enotif