Minor modificatins