small changes

Small changes requested by PO's