More spec file modifications