Fixed a few minor details