Fix up enable/disable so it works.