Cpl small updates
Cpl small changes