Some small changes ...