Danger and Deadlier: Some bug fixes

Some bug fixes