Minor improvemnts