Fix cce
Fully fix essentials TPA handler