ChatPorter: Fixes