Some trivial improvements