Fixes for recovery charguing [NobodyAtall]