Some little modifications that I forgot commit