Apply final batch of fixes for specfile