Fixed ctw configuration issues