minor fixes?