Minor fix and echo values