atom: A few minor repairs