Completed DB-side swap of RID/SID, some cosmetics