Improve spec files