minor fixes before 0.7