RDS tweaks to core