Last fixes suggested by chandra.