minor fixes due to other fixes of fixes