Some small comments etc.