A few minor cleanup items