Dragon's Treasure: Fix bugs

Fix bugs