Fixed up a few minor details