Minor improvemnents