A few trivial changes