fixes to work with latest core, and some seemingly left over RDS
changes.