Improve enable / disable messages