Core: Yet another warning fix

@Kaelima: could you verify MoveCharge?