Making tom's fixes.