Some small fixe