such minor fixes