Address notes from http://redmine.russianfedora.pro/issues/1334#note-3