DB/Creature: Misc fixes to Thomas Yance and guards around

Updates: #3905