Dragon's Dog mother: Fix some bugs

Fix some bugs