[changed] few minor fixes