Code completion fixes
Recharge project code fixes