Minor improvs