More editorial fixes annotations