Minor fix-work inprogress