A couple more changes to get the RSS closer to validation