more trivial changes