Move changes from spec files to common files