nitpicky changes before codefreeze