fixed IsEnabled errors and X-Module issues