fixed rest warnings