Address notes from http://redmine.russianfedora.pro/issues/1335#note-8