Fix last comments