Dawn of Survivor: Some bug fixes

Some bug fixes