Some small modifs