Fixes Enabled switch, add logging.