RPM update, more versioning fixes