Some last improvements