Some small improvement