Minor improverments