0.7, minor fixes