some fixes for enabled/disabled