fixes and additional all_deplete rule [ci skip]