Two small cleanup items