EDIT minor fixes