Fix enabled/disabled issues