Addressed last comments on patchset #21