Some minor modifs