Partial enablement fix..
2 files changed