Changes to make rpm work