Some editorial fixes