DB/SAI: Out of Body Experience (12327)

Fixes #3084
DB/SAI: Ribbly Screwspigot (4136)

Fixes #6911
Core&Tools: Fix multiple issues found by a static code coverage tool