Fixed some minor details