add some minor fixes