Minor fix and other slight changes