(Issue 326) Fixed follow-ups review items for #284