Fix Configuration Bugs in new Commercial Module