Danger and Deadlier: Fixes for some known bugs

Fixes for some known bugs