fixes for architecture noarch, any, all cases