Minor improvents