Further optimizations and adaptations in the spec file.