WhiskChat optimizations - fix them