Minor improvings